From 76b8676955ffa1b346c3c367acbb8b9cdc0f7f63 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 17 Nov 2020 23:11:16 -0500 Subject: [PATCH] constraintlayout: Fix parsing of constant constraints We were inadvertently turning constant constraints into constraints against super, due to confusion between target and source attribute. --- gtk/gtkconstraintlayout.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/gtkconstraintlayout.c b/gtk/gtkconstraintlayout.c index e5d6037962..92fbfcc416 100644 --- a/gtk/gtkconstraintlayout.c +++ b/gtk/gtkconstraintlayout.c @@ -1431,18 +1431,18 @@ constraint_data_to_constraint (const ConstraintData *data, else strength = GTK_CONSTRAINT_STRENGTH_REQUIRED; - if (source != NULL && source_attr != GTK_CONSTRAINT_ATTRIBUTE_NONE) + if (source == NULL && source_attr == GTK_CONSTRAINT_ATTRIBUTE_NONE) + return gtk_constraint_new_constant (target, target_attr, + relation, + data->constant, + strength); + else return gtk_constraint_new (target, target_attr, relation, source, source_attr, data->multiplier, data->constant, strength); - - return gtk_constraint_new_constant (target, target_attr, - relation, - data->constant, - strength); } static GtkConstraintGuide * -- 2.30.2